Add polymer and vazkii's work