First commit of fitness function stuff... this is all super experimental.
Merge remote branch 'emily/master'