Base commit with all of the basic files but not implementation or anything yet
Fixed stupid merge