Refactor coordinate system to use one coordinate plane instead of many
Merge origin/master