Yes, something like that. I'm not entirely sure what your waterbending would count as, but if I'd have to guess, I'd say it would be internal magic, seeing as from what I saw, weapons or objects aren't involved in your control over water. [At this point, she sighs.] Unfortunately, I'm a terrible teacher. If Mirajane was here, she'd be able to help with teaching you shapeshifting; it's her specialty, and she's got more of the personality for it. Theoretically, I'd think you'd be able to shapeshift an entire building, though it would take a lot out of you.

However, I know that there's a person named Terra who lives around here. She doesn't seem as limited in terms of magic as I am, since she can use several unrelated types; maybe she would be more useful as far as what you're looking for.