js module working
attempt merge
atttept merge