Added bulk of options - refs #5