Initial ZOCP glue work