added some todo's