Coming further along now
Resolved conflict