Major changes to app