Initial version of OCHP add-on