added more js and almost there