Vending Machine done probably. Did some cleanup in Watcard.