Just about complete with code for issues #1 and #2 along with other major changes.