Finished world space coordinates.
Merged. Updated TODO.