Move some code to base and add to creative menu for testing