Added bunch of stuff, not working right now