Merging units and terminals, making rooms customizable

Haven’t removed units from the code yet, though