Working towards first working version of patch system