Copied the remaining classes over