Merge of previous project work into this project