Simplified the rails models as part of this reboot