More work on intro drawing, comments for test code.