So light it hurts fixed #169
Merge branch 'feature/ui' of ssh://personal/codeflash/codeflash into feature/ui