Complete overhaul of paths, should work now