eric_zhang commit: container and data structure