WIP.  Finished migrating original files.  Added TODO list of remaining work.