Add in new features from Tan CSS FW