Three way fun times

Merging conflicting changes