mapping code is in, working?