Continue #80, give container a unique ID as well