Getting thrust working after Itchy's large refactorings.
Acted on TODO comments.