Added some setup stuff