Added objects to track entities position. Change collision detection to use new objects.