Conversion over from Full Version

This uses the same functionality as in the textbook.