Lots of updates. WIP.