You're right, I think I should have take a break from work before coming back on this PR