TAKE TWO

Yadayada Surplus crate redux look at its commit for info.