Moved some properties around and setup a facility to override them.