Initial "basic integration" implementation