Working on some code cleanup changes.
The current function naming scheme is a little unintuitive.
Perhaps it can be better than what I'm doing and proposing, but this is a start.