Lots of refactoring done to nearly everything but the wastewalk itself