I had similiar issues, so I created this sheet that will work with the existing sheets. I have just added savings targets to the system and am testing it now. If you are interested I will post as well . here is a screenshot.
Here is the link to version 1.3 ( does not have savings targets yet)