Merged a whole heap of stuff, changed blue/blue attack