more stuff compiles... getting close