BC Facades pt 2

...how about I actually finish the change this time!
Merge pull request #105 from Cisien/patch-2

BC Facades pt 2