finish iteration 1 - basic app