Added trees and basic collision detection