Thomas remake

cranky bugs daisy off the rails