#1 more updates, still much to be done