Added mapping + initial stab at using the headers