Added container idea to location class