Initial import from kolibri