Prep for fork to rewrite create feature code