Added some more functionality to things and shit