snapshot

Alas, I somehow lost some changes, so this is two steps for, one step back :(