Started implementation of Rivets