Should add a comment here that this is no-ui, otherwise this looks good to me.