Adding a bunch of shiiit