Added a shitload of stuff