VET-77 Implementing new formatter - 90% done