First shot at EB integration