Finally working on my app