Created branch and made a few basic changes