finishing maps for now to close #155