Let's merge these now and you can should me how to write the tests tomorrow? So tired, need sleep.