Continued work on CreationSelectionLayer