broke app and working to fix bugs