added some higlighting on the TODOs
incomplete try