Some more work on adding two-factor features