Added some methods and other shit