some new stuff

@@TODO move script to main.js