Start of rework for work api