almost finished the js work uff