Lots of changes. Basically finished.