More work, added figures...