Yea.. Battery seems like an important part.

I will let you know if the starter fixes the problem. If it does not then I will probably have a lot of questions on what it takes to rebuild an engine.