Added atomic format; not complete but styles should be moved over