Moved over to inherited template system