Merging initial version of code