Jhbate/firstcut

WIP for review purposes @cheddar @kentquirk 
seems to - but i will double check in the tests