another TODO item gone with regards to javascript
more code