Clean up
Fix a few bugs, add SWI
Point.
New busy infrastructure