I wouldn't switch to a glass tank at all, lol. I'd keep using rubbermaids until it's too big for them, then I'd get a custom cage online.