Yep, looks good, I'll add some comments.