Fixing Facades, aiming for #163.

Signed-off-by: Ben Corlett <bencorlett@me.com>