Sorted out the headers, integrated should be easier now