more commits and tests
Merge https://github.com/lsukharn/test