got the app mostly working