It's fine to punt on the standalone stuff for now, we can address it in a subsequent PR.