Another night worth of dev
merge errors