Hacking in Apartment integration.  WIP