Quick snapshot, almost done
This seems to be working