wip
merged js files :(