Towards a plugin (hopefully)

Requires additional work.