Sim2 and Robot2
Porting to new files.
Also added some graphics.