JamesTripleQ

Hi, this is a PR I wanted to make back in February after my previous one fixing potions and other small things however life got in the way a lot....