finished reworking the models and the sample data; next we attempt to regenerate the app from this crap