Removed TODO items to become individual issues in GitHub