Completed implementation of several arbitrary shapes