A little more refactoring. Closes endafarrell/orla#1
A lot more refactoring.