Updating classes for new API
Commenting old code, and trying with simplest example
Moving old class to follow the new structure