Added Todo Highlighting and some test stuff