Kolibrie work in progress