Here be Dragons

Refactoring