acad5c1608
All of these changes were needed to get app compiling after refactoring
All of these changes were needed to get app compiling after refactoring