Moved deck to a class