Split out creators and added some templates