Facade removal near complete
Merge remote-tracking branch 'origin/Dan'