Added new shapes and class to handle overall game