working on js now