update algorithim to the latest itteration of algo
resolve merge conflicts