Move observe-from-observe-changes into own file