Done refactoring; Left to do: tests,on-/off-line, changelog, docs, and local saves