testing + rewrite

testing without hall or bridges is almost done