Various updates. Doesn't compile, but working on it.