Added some quick todos