Additional changes

Changes to swap how internal memory address are handles in lu of
removing indexing