Merging in my first work