Refactored; added state property to command struct to notate where in the lifecycle...