Closes gh-13, closes gh-9