Added good map, removed template file
Made constructors public
Updates for FindPossiblePushes to work (it seems to be working, needs more tests)