Move to hooks and renderprops wherever possible