WIP - add check user path