Added two todos so I wouldn't forget