Rough draft (non-debugged) of Supervisor completed, minor edits to other files. FeedbackResolver integrated into Supervisor.