Snapshots

Patched incompatibilities with master. Merge should be conflict free. More info when time permits.