Added some sweet initial setup stuff