Some updates. Still not ready.