More wiggler work
Collapsed the separate enemy lists