requirements done, working on better js