Lots of updates, now fully contained