Finished a pretty significant re-factor of the memory code