wrap up rewrite of stops
add files
merge