Begin rework of back end