Added some block and shape functionality