Closes #76; adds more content;