Sounds like you're already on the right path! Money needed in the next 3-5 years should not be in the stock market, so find the best yield you can for your funds and just save, save, save.