added more cv, gets stuck at @TODO...
Merge branch 'master' of github.com:klockowandt/TSEA81