Added a couple of TODO ideas