Starting work on class name insertion points handling.