work on javascript business
java work
merge of javascript work, not fixed
all in good state