Import all the new stuff
Cleanup old cruft