Combining Tracking with Drawing

- Needs commenting / formatting
- Rough proof of concept.