Began working on this again.