Work on main payment class