Wrapped up everything except for 7a and bonus