Started looking at issue to fix broken songs