Alright, this is where we are:
http://piratepad.net/xYCRN15dsv