Issue 3210 need to track whats been pushed

Please do not close the task, there are some things still missing. This is to be used by #3263