removed old operator stuff; fixed stuff so it will now use new support functions