This is a task to be picked up once we've stripped away the old java code and we're fully using Kotlin.