First commit, adding work done so far