Not quite done, but committing to merge for now.