Started modernizing the code.  Hopefully the first update of many...