Tidied up a bit
Now with some ThreePenny