added some todo's
merge complete