Need to do some inital sorting