preFinal commit

Application generally done, but there are still a few changes to be
made.