Moved all fragments out
Merge branch 'eric' into grant