WIP snapshot (~50% done)