RMI HW Complete

Did many changes here and there to just get it to work like was in the
requirements.