I have a tentative plan yeah, reserved mana, and magic/focus having more direct impact on mana. Not super well fleshed out yet tho, and it'll be A LOT of work, so it's down the road a bit cuz I have a lot of story to worry about.