Temp commit, wil work on this refactor later
Refactorered user and formulas
Refactor!