Add column tracking

This is the first step towards solving #199