Work on #6

Ok but we will use map or hash instead of vector