Nearly fixed, issues are created, I think removing old ones is still broken though