Add Coord classes with iOS-style CG... things.
Merge.