Rebuilding routing

Currently breaks music player