added columns and starting to change over to new design