working on js now, calendar still not working