First wave of fixing create functionality