Initial work - Richard Green
Fixing merge conflict