Why not both?

Underwater movement is done. Not making nearly as much progress as I'd like, but I'm happy with what I have so far!