Still working on path-issues