Cleaning up Container class and sperating things into own classes