Moving things around. Making things more configurable.