Actually, this is super minor and wouldn't save that much time anyway. Better to keep it simple for now, but maybe we could do it later