It's been a while, lost track of what specifically I was working on so
lets's just say this commit contains "stuff"