major changes to all parts of app