Reworked handling of interiors, still need to update the editor to support the changes