otw - Added new Cubiquity framework.
otw - Added new Cubiquity framework.
otw - This may be a bad merge, but here goes...