Release v2

Updated OO implemented in live enviroment.