Container list

Ready to be merged with master.