Added some more functionality n shit not really much
FUCK