ToFU/POP

Note that this pull request is stacked on top of the modules pull request.  Please ignore those changes for now.