Intermediate changes, added initial JS for effect tracking.