Started adding the neccessary building blocks