closes #4, closes #5, closes #6