Setting up the basics
Fixed merge conflicts