Now working with ActiveRecord, still has old code commented out.