major tweaking to try to fix models and views