Revisit

@apg this is here for us to discuss mostly.