Started switching Storage class back to using HashMaps, needs finishing