This was begun in #344 and I thought I'd give it a stab. What do you think? P.S. I live tested it for the first time on this PR and it worked :D