- Add functionality required for agent
- Fix bugs
- Fix tests