all parts working! ugh now to add custom shapes