Assignment 6: still WIP #35