Add docstring header comments and move force TODO