We should clean up the point picker. Make it a Marcher picker, and make it a function with less dependencies on all the classes.