Added Shape and Circle classes