File cleanup and basic attack interactions
continuing some basic attack commits