More Progress on Rewrite

Continued fixing things across various classes to make them work with
our new core classes.