Here are some more changes

- note [ right now it freezes up somewhere ]
- need to debug