- working toward better organization of app