Just added some TODO notes for future work I would like to do