Finish intial tdd app rework