changed all find_by_id's to just find for consistency