Identified major clash point for CSS, WIP to squash