First go at implementing simplifed behavior logic - take 2