Many updates. Skeleton in place for overhaul to A2