us is almost done (still some problems with js)