Done

....more or less, but for now it's beer time