getting rid of API class
WIP -- updating classes and functions: