First pass using new logic model. Some buttons missing