Strategies 2+3

Implemented strategies 2 and 3, as defined and discussed by the google
doc