Modules

Work on modules, stdin, and completing mapper.