Partial commit - most of formulae working.