HCOLL-167 Created a stateless map - very much in draft at the moment