added datahandler wip