New is almost done!

Also, did some general cleaning up.