Finally back to where I want to be

Everything working how I want it to with all the changes as of last night.  MERGE!