More work to conform with #1 and assignment prep