Adding todos and making better files