got rivets working