Added map, vector movement, partial collision