Add structure experimentation and minor HW5 changes.