Added more todos [ci skip]