Three way fun times

Merging conflicting changes fixes #3