finished everything except for the bonus problem