Lots of updates and additions but more work to do