Uses better map implementation from lab6 now