Pull request week 21

Implemented facade convention correctly and more.