Yes. I think you should try to fix the current state first, then add the next chapter in the background...
