Sounds like a good set of goals to me, good luck!