Fixing path
More scaffolding