First pass at a more flexible configuration