Changed delegate implementation - class specifier and weak delegate vars (optionals)
Still more cleanup...still builds