removed testing breakpoints
95% working
note