Simulation

This serves as a good basis - only makes sense to merge it to master