working on registering clicks, but other changes completed