Leak Tracker

Debugging, refactoring, and unit testing