Closes #71. Closes #52