Removed commented out code
Added support for selectors that modify more than one element
Layouts now seem to pass basic tests