First batch of updates. Kinda works.