added a fuckton of stuff