Lots of updates. Ready (i think) for content