Closes #66 I think

Used some helper methods I used in my mods. This should be working but
I can't really test it atm.