simplified model, added a bunch to model, haling, commenting, basic app flow