pull out creating conflicts; use ::= for simplicity when updating lists
Client partially rewritten; still need to do update check loop
first pass at Client rewrite finished