Including shapelet model for DM variations
More shapelet stuff