Started merging yetibox project