done some of these TODOs