Namespacing Expressions
Adding in a "drunk test" spec
Refactoring and tidying up