added a bunch of new shit