Added Crypt Facade, and cleaned up