Added Todo and fixed up processor