Initial Commit and rough align of fluid grid.