Use wrapper to allow squares and lines in additon to circles