fix obvious bug, mark todo to make this work