Refactoring almost complete, need to filter columns still.