New physics

Chipmunk experimental branch has done what it was meant to do, we can now probably merge it to master.