Attacks and hits

Some TODOs to work on