added stuff still wip