Starting to set up better inheritence