Added a crapton more stuff