Task #185 add bulk of the changes