Wrote up more plans, TODO notes