Restructured some code, everything works the same.

at a user’s level at least