Changed a couple of things and got the basics down