Refactoring for 1.6.1. Doesn't compile, still a lot that I need to figure out where its moved to.