add compass, consolidate locate