Making it ready for a merge?

Let me know when can merge these?