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

This reverts commit da6b560521a6f7164a91e273ebe3dcf80bf1a0fb.