Partial refactoring to be instance-based, refs #16