Fucked with the robot some more, changes are a few commits behind