Adding TODO's to avoid crashes