Added first version of column selection
Finished column selection