a little bit more billowy again
Tidied up interface, few more misc things to get ready for hand in