Removed some old test code
Added Stat Tracking