Things in a half broken state after shifting hooks around.
Finally got hooks in the right place. Need to clean up _app code base though.