More progress, about to switch back to dedicated enemy class (not interface)