Starting to get somewhere thanks to some path handling