Update from Phase I to Phase II

Phase II is ready!