Moves model geometry methods in to a concern