Jhbate/firstcut

WIP for review purposes @cheddar @kentquirk