Preparing to add more misc functionality.