refs #6, refs #7 Intermediate commit