just moving some todo items here