Add semi-functional comma insertion, code is very dirty