Initial Commit, checkpoints 1/2 done