wip: abstracting wrappers into class