Wrapping up

Should all be working now. Just updated header