Almost there for #7