WIP adding CIDER support