Added in formula, UI design in progress