wip structure
reorganzing things
testing, wrap seems to work with at least 1 library, need more test cases