First pass at adding flexible columns.