Added a shitton of shit