major rewrite to previously completed sections