Why can these TODO items not be implemented in this PR?