refactored out logic a bit more - working now except the teens - needs more granular tests though
got tests around granular formatter objects now - now to get teens working