Add tests and coverage to this (creative) mess