WIP: Refactoring model classes into ActiveRecord; prior to special query changes