Functionality working - delete wip