Fixed all app logic
TODO:
UI!!
Add more features