First round of file additions
more config changes
more cleanup down to a good base