Continued work on pass II, skeleton of it completed by adding outline of code for persistence.