added most of solo challenge U1, W1