Switch to a for loop
Add '+' selector support
Support special case 'a + b'