Snapshot. This is coming along.
Rename some files and clean things up a bit.