moved members to cpp, new manipulators