Sub'd. This looks like an interesting rebuild. Maybe move it to build threads though...