removed 2 TODO's, added count loop/command