I will add some todo's for me. I know how important this is.