Add some more functionality.
Merge.
Clean code.