many updates and a first pass at implementing jen's design