Added formatter

work in progress