Started first swath of changes to Dave's code.