Added Formatters

Requires more unit testing but here is initial work for review