Implemented CommandStore all in one shot!