Closes #73 Again