added functionality for containers and some user interaction.
Not tested yet