Mapping completed

A lot of changes to everything here since the old way didn't fit my
mapping algorithm. Characteristic vector update also taken care of. Next
is the offline portion (actual clustering).