Closes #51 for realsies now