Not sure what the best way to handle these compiler warnings is
Add some more stuff
Trying to make more of them opaque, and commenting more stuff out that should be
Got it all working