Don't forget adding functional tests. I have no more comments to add.