Hammering my stuff into Joe's format a bit. #fingerscrossed for successful merge.