Closes #70, closes #71