First pass at a new system check