Massive update. Lots of things working.