Continuing to refactor things out of the general character into more specific sub-areas. Motor this time.