Added initialization phase to the whole thing.
Merge branch 'initial'