More code for code

Hooks don't quite work yet. Pivoting to SVCs...