Added some more base structure, ready to being prototyping.