Started changing to array coords for internal use
Finished updating to internal array coords
Merge branch 'test-jake'