- Some more clean up. Code is now much better
- Recursive layout processing (which broke conflict detection :-(