Final changes

Everything final.  Prepare for nuclear warfare when this merges if history is any indicator