Intermediate commit.

- Architecture is not finished yet.