lot of things working now

sanity local backup before trying to merge work