Commiting latest work. Can now link between maps and lists