Move some functionality to point_controller