Finished all except the bonus question