second commit, added some js functionality