Lots of cleanup. Testing tool.