[WIP] More work on facades. Fixed a mistake.