Add some more stuff and fix some headers
add even more stuff
Ok it compiles and links