filter styles
ongoing work
merge conflicts resolved