AvdP - Ported stuff to OCClasses
AvdP - Ported stuff to OCClasses, new files added
otw - Merged with branch OnlyThreeDaysLeft.