Which of these functions should come out of mechanics?
I think it should be only those that DO NOT deal with any classes not included in the new files.