Updated traverse and added FindSpace