Updates from Wednesday discussion (post HW-completion)

Additional functionality