Add collinear shell
fix error
Make test pass
Fix
Temp commit