Finalised Cursor/Unit Accessing

This is a fairly large commit, therefore I will trawl through the
changes on the GitHub website and commented Additions/Deletions.