Major rework to use simpler placeholder system