At this point in time I want to bring my Grammar in line with my Speech which is fluent. I just took German in school and decided to stick with it. I'm planning to move on to Russian or Chinese in a few years

if you do chinese you're in a good place cause there's such a lot of interest in chinese in the english speaking internet you'll have lots of resources and advice, same goes for japanese.
