Begin to reorganize/revise; add TODO