lots of changes

Signed-off-by: danielcollette <daniel.collette@pb.com>