No change in functionality in this commit, I just broke the signature to have a systematic audit of the callsites. Added TODO's with the plan for each call.