Last checkin from old laptop
added missing stuff