adding work
merging code