added stuff in simulation, pretty chaotic atm