added TODOs
added cup count
Merge branch 'master' into gh-pages