add expand with cwd

Add expand to work in a cwd