working app, a few bugs