IA

- Needs debugging
- Some minor changes in report