first integration of everything with Andy's work