added map
added preliminary code for collisions
merged jared's work
fixed build for mac