It sounds like you're making great progress and so is your friend!