account for empty ids.
Merge branch 'master' of github.com:rijack/Cool-Innovations