add castor and castor_windy

Change-Id: I40475b9881f1e3268a014d3eeee55ecc0e3ccb09