Merge with fade changes

Have not worked on grid yet