Another iteration

More updates to the API

Some screenshots of what the reporting looks like based on different scenarios

![image](https://f.cloud.github.com/assets/453152/884890/7c0a772a-f9c2-11e2-80f2-da023276c42d.png)
![image](https://f.cloud.github.com/assets/453152/884902/8fc3e256-f9c2-11e2-9cb2-88aabb9c3884.png)
![image](https://f.cloud.github.com/assets/453152/884907/aaf8181c-f9c2-11e2-86c0-5649079e0ef3.png)