working - ready to refactor
first refactor
Merge branch 'black-jack-refactor1'