Working on ticket #9.