Auto Path Stuff, reorganisation
merge?