More additions to HW04

See changes.