interim commit, needs bugfixing. javascript is broken atm