Merge stashed changes.
Move Matt's placeholder code into module.