Working on bullet 3 of #53