2.0.0.0

This is an incomplete build, but just what I've done so far for the
rewrite.