Intermediate checkin. fixing before demo