finished first pass at mapping