Tracks resources

@liammccartney 

Take a look when you can.
Only necessary changes