working on JS… lots more!