reorganize typemaps (work in progress)
reorganize typemaps (work in progress)
reorganize typemaps (work in progress)
reorganize typemaps (work in progress)
reorganize typemaps