Javascript fun
Fixed commit
Fixed merge issues