closes #50
closes #5
closes #5