Initial work on curse support