major re-write
ditching dead freight
restyled update view