initial commit of more complete app