added grid and circle classes