First attempt at preprocessing queue
Merge branch 'master' into working
Latest
Merged with Matt's latest
Fixed the broken merge