Handled a TODO, will need to return to this later