Updated Winter

Less ambitious complex plan