filling in some todo's