make it work a bit better as an app