Less kingfisher specific code and a bit more polishing on rough edges.

Hopefully, this is more generic and actually working now.