Finished Up the Containers and added some extension methods to make this easier