Improved algortihm efficiency and accuracy. Still not quite there yet.