Started adding options and annotations for C* CL and association mapping
Added more option handling