Refs #40 - updated with some docblocks for methods that I touched