Added some degree of pluggable formatting, to be extended.