Dirt adding is more or less done. Fixed a couple collapse bugs
Merge commit