Added more class, made changes to BlackJack implementation