merging with fishlamp obj-c