Operators update

Still some problems with references and pointers to resolve