moved js
reorg
reorg
fixed scope errors and basic testing
added four buttons and more irs
half merged from master
merged from master
manual merged