begin cleaning up WAMP processing mess and adding full time tracking