Working on moving things to ActiveRecord
Working on bugs and excel import