Edited Clock and Deck. All methods functional