Move more logic out of board, into cpu