rm MWF
Fitness refactor and minimal tests