Finish assignment, add challenge question