started working on main app