moto-21: two WIPs and showing the linework for T-2