- Initial pass at adding reachability code