Commit working version (hopefully) through test08.