closes #5, closes #33