Lots of changes, trying to thread.