Initial checkin after hackfest.

Almost certainly never to be touched again