Final cleanup from nationals. Merging back into master to start next round
of development. Still many custom hacks from nationals.