Reorganize and document but still broken.