Adding python and js stuff
merge