experimental common lib update
moderately working code