Progress

Some progress on two levels...