Refactroing and bug fixes. Progress on example 5.