Fraction option done, (almost) ready to merge and close branch