more api changes
more api changes
ensure new methods are used
refactor and add docs