Changes for issue #21.  Still need to move off the main page stuff.