vec is now array, map template simplified, new structures stubbed out