Some half-done changes to coordinate classes (won't compile)