Refactoring
Completely unwind dual-model approach and upgrade to latest gems. Rebooting project.