Renamed some things, added I and R registers