Big commit domanu & cygan changes