added some todo work