Changes from last two coding sessions