WIP while the current directory issue is fixed