First merge

First time Andrew made changes