More changes to bj logic. Game is broken atm