Merge initial code to master