Okay, I can accept an incremental PR as long as the issues get addressed in future PR.