Refactor IO. Start work on unit.Kill