Finalized the integration

Signed-off-by: Arne Schreuder <arne@consulta.co.za>