I just moved to Tokyo. I started learning Japanese using Rosetta Stone three years ago but stopped about a year and a half ago. I continued to use WaniKani and am a level 15. My company gives me about a $1500 budget to enroll in Japanese classes. Does anyone have any course recommendations for someone who is not a total beginner but who might also lack some of the fundamentals?