Refactor Map to be more data agnostic.

Nearly begin adding collision detection tests.