Name changes, as well as additions moving towards csv input