Changed the base container; added feedback functionality; wrote tests