began manually adding in active_record stuff