Starting to make the changes Peter H suggested on ticket 43