Update framework

Fixes exception errors; adds some new classes and functionality