Finishing the first pass at a fitness algo