Adding numeral.js and better dispatch. Clean-up soon