m
Merge
Changed the coordinate interface to use methods not fields