Closes #73 for now