major update

close to completion