no longer have to use specific modules for most functions
Merge branch 'readme'