App is almost fully funtional now