Major rework with all sections separated out.