Added some experiments with rivets and angular