This was simple, if it actually closes #5