Move Exceptions to top level
implement source-capture for whats completed so far