Clean restart

Things were getting awfully messy. Pick up the knowledge and start over
in a hopefully clearer manner. Keep the additions from throughout the
semester out of it for now as well.