Lots more work on decision logic