This should work

I made a new branch of your code. Merged it with a temp-branch I made. Then merged it with my master to prevent any loss of my or your code. This actually went together nicely. I think...