removed mapping functionality. added basic working framwork for new token specification methods.