Lets merge these two

Lets merge these two together. Use a +1 to confirm so I can send it.