Collapse

I collapsed the various versions down onto a single file to make tracking easier.