Updated algorithms

Basic set complete, testing on ratios/returns in progress