Basic integration complete

--Actual adaptation to follow