Mostly Trapping

Some kind of trapping proposal up for discussion