Updated

Complete overhaul of attack structure.