Added some of the initial setup