First commit of work - still need some of the NA imputing work