End of Thursday commit

Still a lot to do to get the header working, amongst other issues

Signed-off-by: shaunkrd <shaunkrd@gmail.com>