Should these be functions like the others? Or is that too much?