Refactor & Start for MR support
Snapshotting yo!