Some updates. WIP.