First commit, basic building blocks added