WIP Refactor model classes into ActiveRecord models