js and oop finished