Merge in master
Update to build and pole csv.
Remove stuff
Need to rewrite the history