Working app, still need some UI improvements