This is great, but I'd rather keep this as an optional requirement for now.