undo of previous breaking changes. continued implementing fields and methods. cup-generated java file  has no compilation errors