started work on main app