Closes #76 and closes #75