working app
more changes