Most of these functions are being moved to the model now