[WIP] Moving things around in the facade code again