Still working on js solution