Finishing up curacao-embedded support... got it working