Helpers for now are really just focusing on math functions
More work towards the refactor
More refactor work
That should do it