Hardcoded work in progress on new paths...