Merge with develop
Progress on susy grid