Merge

First pass at merging the files.  If it works I will nuke the .old