Re-did collision

collision now works off of the objects layer in the map.