WIP refactor to make related parameter and behavior more sensible and speedy.