Some work on commenting and created Rectangle and Square