#6 Pretty much done, just small stuff