First public push of final. Still needs some odds/ends.