Initial Commit
Adds second hadle and fixes tracking