Reachability work started, renamed some stuff