buggy-compiling models

Most of the work in converting everything to models is complete. No
compilation errors but the app force closes. Need a fix.