Some Class changes - MAJOR dataBinding a lot