Shaping up using the new Opo protocol
added Opo.h file
fixing minor logic issues in both stable and dev