working on final application