IN PROGRESS, attempt to ensure we only send one response regardless of changes by user
Code cleanup