update classes to use Coordinates