Add roommate and sanitize the rest too