working on final app